updated for assignment 1