added more data-caching....