re-added things that were lost during repo move