[SP] Part of last commit.