Updated the IAC handling code