Improved initial state + proper load order for spc state