Update to @ Date.toString format