20130816 from charles-dyfis wip