modified staging version