done: use η/fn in more places