A lot of clean-up
Added first output (FailureOutput)