updated status from jor commit 7a18d23