Few changes from Sergey R.