Rewrite drag to use a helper instead of a clone (much better performance)