first commit of redesign