Final mods to add live output support