Added conditional clause