Fixing bugs redo , highLight.