Update from 1.x and 2.x to 3.x

Last updated