Better case (32/33)

Better case