added Devbootcamp's changes2