last commit before code optimization