All data added, various other changes