Made some minor changes with insertable state stuff