Major changes to main data