Updating interface as per Nick's suggestions.