Refactored the update fetch to make it non-blocking