Added VCS variables, testing P1