updated drag and drop