renaming
adding third condition