added non intrusive mode
added non intrusive mode