Tune the table encoder more