Changed parameters
Minor edits to account for changes in tnr
Init try and pep8