added a conditional