AMENDED AND RESTATED PARTNERSHIP AGREEMENT