Better version (10/36)

Better version