made a few slight changes