Part of the last commit