Changed some output format