Builds ok and regression tests pass