major changes for data and ui