added some slight changes