Updated with Gil's suggestions from the sbinary review