Better version (17/36)

Better version