Simplify update process (sigh)