now from cassbranch

please, see if makes sense to merge