Replace strange "bestPayload" mechanic

FIX issue #1