SERVER_TAP modification