updated status from chl commit d242760