changed output format to make it easier to convert into a map/dict