Working on fixing reset issue