Better version (20/36)

Better version