updating to the rebased sufia branch