refactoring selector
refactored draggable