Added safe reloading