Update to Punish class