Modified how to handle fetched data to reduce computation