changed database load to be more incremental