updated status from zaf commit 5f97933