reuniting latest release with recent changes