Fixed & issue with parsing and output format is now as required