+1 on both those. Upgrade to 31 spline too.