Updates to FW3 and including outputs