Edited the fetcher a bit