Improve reloading
Refine