Added assignments 20 and 21