More functionality, Improved Output

^^