updated with class changes