Addresses #13 and updates data