finished 3.2
merged the commits