last modifications about Openflow after merging