Fixing the interface a little.