merged master and added vcr to specs