added incremental loading semantics
cleaning up