REverted Ira's commits by Alex