Better version (16/36)

Better version