New safepoint before fiddling around again...