merged 3.2