Tool mode now more uniform with other outputs