lite mer optimerad statemanager
Merge branch 'Jessica'