removed caching...bad desing and approach