Updated Server Client Interaction