merged dragndrop branch