Simplification of new Yahoo approach