Works better than last commit