reinstate tweaks lost  in merge