Implemented Igor's recommendations