edited 3.2