Assignment 3 - more solutions