Finished changing to new format