Made changes for Assignment