few changes v3.1 pr2