final version of ifma
merge