added doccs
Merged Andrew's changes