Refactored reset again (fixed the local selector)