Finished new refactored data