Better version (32/36)

Better version