Master commit of v.2