updated from class 4/2/13