Cope with 35

Cope with 35