Develop

Some modernization in getting data.