updated, end of class 2/19