Added in checks