Minor changes to match tutorial