updates to fit the tutorial version