8505 a1 - Added new client and server from lab machine