Updated pang and moved logic to server