IFMAP changes from Tapan