Fast-path (first commit)