New version with Regression testing fixes