Started implementing new format
Resolved Conflict