Done with changed output format