better modifications to tapping.