Minor Change to support non-drag/drop