changed output formats according to specs