Draft 1 Tweaks