Ok... NOW my changes (disable hit to set reviewing)