V1 improvements