Adding more prevariant checking