Refactor drag