Changes on logic - switch to if statement