Minor changes v2.