Additional clien logic