added nanliu/staging