Changed, improved clients functions