Added a conditional (working)