added infinite distance fields (rather than -1)
requirement parsing makes sense