Update logging in stage-1