Modification to make fork fair (and maybe slightly less complex)