hooking up client
fixed server conflicts