Added in rest of IF statement