Simplified the UX