merged with ivan