updated status from chl commit ddd8eda