last commit before redesign