Updated for staging for milestone 2