changes to support drag n drop.