Better case (24/33)

Better case