second half of class changes