Attempting to make reset process faster