added tfpn stuff
merged