Assignment 5 1d and 2f