EXPERIMENTAL: New Update handling