Added other conditions
merge