Kostya modifications
Third initial commit