Improves our CodePro quality even more!