few condition changes