Specialquest refactor