refactor drag
refactor drag