Changed retrieval logic. No processing there any more.