Better version (19/36)

Better version