Redesign init