Commented Var checking because WIP