Update stage-2 e/g shape identification