Update to use tape rather than tap