changed retrieval to the method where strings are precached
resolved mearge conflict