ADDED: better way for fetching data