Additional updates preparing for 0.V