updated 1st and 2nd assignment