Re-implemented previous (erroneous) algorithm of deferring data load