Challenge set 3

Finally completed all changes