Iterating towards the new design