Added modifications from Summer 2013 work