removed client side, added geo stuff