Added the ability to output more detailed info