Fixed Todo and yahooSource