updates from v3.0