Drag and drop question was added
Merge with the latest changes