tweaks
Refactor
conflict resolved