merged with latest from midget spy