Actually handle updates correctly