Modified for the server testing