Cleaned up interface prototype