changes from Igor