Redesign for simplicity