Removed need for allocateOnDemand