Changes according tutorial