changed models and tutorial code to match