updated with class review