AMENDED AND RESTATED GENERAL PARTNERSHIP AGREEMENT FOR