Change in function logic