adding in assignment 5a and some other things