roach state now saved and restored, seems to work