last commit before redesign code