first pass
modified broken exist check