first major commit of v.3