[BUG] Messy updates