Revert "Changing how data is retrieved."

This reverts commit 4ab54359c2127e01aaea87dc663126a904446647.
Revert "Revert "Changing how data is retrieved.""

This reverts commit 34becbfbf1ce22652a03cf892db6dc5ed2c0e782.