point-context: Update from Original