updated status from esh commit e301a3c