Updates to use buld loading.
updates with data generator from Wyndham