Redesign for version 1.0