integrate warvariucs suggestion