More steps towards TAP.