minor changes v3.0