Adding tap for testing