Made some modifications for staging.