move code from ihor.