Before class redesign