Simplified interface considerably.