Finalized version

Updated data and format