Finished first redesign iteration