Editted up to lesson 5