Major tweaks to params