End Drag Refactoring