Updated with class information from 2/10