Updated drag drop. Also added iton for initiator