AMENDED AND RESTATED SUPPLY AND RESELLER AGREEMENT