Added Eldar's changes