refactor, fix dragging