Rev'ing BP commit + semantic modification...