Add back in all functions except fn