Updated core files to match tutorial