Better version (11/36)

Better version