A few more changes

Clearer set up for add