implementing comments from Nava. Drag & Drop.