Replaces fn with fu
Change to work with new tg
Any types and single types
Remove fn from dependency and add fu