added clone and tap