some slight changes...