Final update for 1.2.0