Prep for Gallery-Auto-Scale