Made some big changes to the output format