Updated with reset on reload option