started on 1.2 changes