Added new more robust format.