Added in logic