Added a few more outputs