Latest changes (results not coming back for some reason.)
This version works!