🔧 BRANCH: redesign