Fixed (?) saving states, encapsulated in methods.