Adding tap_if + small revisions