Party rework

Party rework