Better version (22/36)

Better version