get rid of #tap