Second Commit Tweaks