added client/server check to more bits