Few slight changes