changed to tap and other changes to make this one pass

r?