tap related changes