changed by andrey 2