Some modifications after first server test.