Follow up on drag and drop change.
Finished the drag and drop change, testing needed.