updates for Stephen's class