Final working changes Assignment-1