Added SRS, load states, reset states, storage check logic