Some more improvment in IA -- still not perfect