Anand cleanup1

Pulling in the final version from our presentation