ADD: make it possible to change output format