Upgraded from 35s on 20s to 37s on 17s