updated status from khm commit 6b84c12