Some update of the if statement