Initial changes to drag&drop software