Added Gregs changes into this new branch