merged my stuff with Ivans