Rafactor  to be lazily applied
Tweak changelog.