before merging with ofir