updated for Yahoo format changes