More Tweaks to params