Add G state stuff