Cleaned up interface.