Made Taras changes