Formatting and re-ordering of IAP