Better version (34/36)

Better version