Updated If Conditions