Updated tap