More work on aggregate feff calc