BIG UPDATE WITH SERVER CLIENT