persistence fixed, needs testing.