try to fix up some more interpolations
start to unpick the next for loop