Updated client side stuff