Longer terms as suggested by Claire.

Update for #10