redid nn with new method signatures