made changes jon suggested