Save states working for mapper0, something is missing for mapper1