Additional code for SharkServer2, still untested