Working on the next major version