Updates to handle multiple IO sources.