Updated to work with new print/goto behaviour