major updates to motif2, switch to new fcn