Slight changes, now done for time being