updates in prepration for distro swap