Added in a loader to make it less invasive