Update to the UpdateHandler to fix major bugs