Better version (21/36)

Better version