removed caching data for improving speed