Added in a bit more output