ClientPanel modified