rearrange stuff to deal with crap from parsley changing