made even more changes to code