Modified Client and Server