some slight changes