Adding more debug messages for TAP