Tweaking param logic