Improved discovery 2