updated version to reflect soon-to-come merges