Added conditional statement