Finish 0.90 update. 3.2 FINAL