improved design for discover