Tweaks to both how it works pg and In-house pg