Improving Fetcher Day 8