Updated changes for assignment