some progress on tap