more updates to issue 9 to staging