getData changes to model, need to be moved to master