v2.6 in progress...