Better version (15/36)

Better version