adding new format and bug fixes