v3.7 final