Checkpoint source inline with my (attempt) at an updated fork