Cleaner solution to IQ node