Client and Server improvements!