changes to make this easier for upcoming rewrite