changes from Oleg