Current implementation doesn't preserve the parameter order for the added if statements: 