Rebased enc sync

And return