Synch with new v.3.2.1