cleaning up -added u def in units
learning to use multi-branch sys