GSP: Added reinitialization of other state objects.