added tapfortap support