Adjust function definition per IF comments