refactor client side for country move