WIP - fix so that new trees can add S/A