Carls recent undocumented changes

These should be evaluated