katoh commit
modified for some ios aip