1.6 update plus state stuff