initial adjustments for refactored version
validation tests ok