Added demo checks