Conditional statement added