first changes for assignement