somes little changes and drag&drop example