Balance server side + code improvements