AMENDED AND RESTATED CAPACITY RIGHTS AGREEMENT