changes requested by slava