updated to handle good client 2.6