slight modification to make client/server more consistent