Improve reloading