wip using late safepoint branch