Better version (33/36)

Better version