some slight changes I made last night