Update with 1.2 feature