Changed some things in the output