restoring conditionals and moving correspond paramas to pure booleans