much cleaner reload code