Added second conditional statement