merged 3.0