Added functionality for the case of reloading