Better version (14/36)

Better version