made some slight changes