Merging with Igor v.2