Finished update for 1.2

This has support for 1.2.0.3