Better version (25/36)

Better version