Added some more outputs.