fixed infinite loop.  Onto different issues