Fixed to output several different formats