Better version (7/36)

Better version