added auto drag and drop