incoorporate dmitry's changes into an older commit