v3.1 in progress