Final improvement to the last commit...BANZAI!