Finished V4 updates