updated for assignment 6 and notes