Slight update to make client plug-n-play