prep for standalone version as well