first changes to code