Commit after Evgeniy adjustments