more changes to code