added assignment 2 and 1