changed how data is loaded