AMENDED AND RESTATED JOINT MARKETING AGREEMENT