Prepare smoother future updates