updated in class 3/18