Refactor of the refactor

back to the original with one change……