Some changes from Natalia Oskina