Cleaned up API: