Added final functional from drag&drop