updated from ckandoth