Implemented output per driver
Small bug fixed