Version2 working

Probably should uncomment. We dont want to kill clients as we add more fields