Manual Restore of Gabe's Work and Tweaks