Slight changes to interface