Critical changes for last commit