trying this refactor again
merging