Added server_end and client_end, currently empty