last commit before redesigning