Updates to logic to include else statements for certain params.