Continuing mainline development