Changed output parameters and input options