Adding tap module back in