rework to have some consistency in output