Modification from temp3 local repo.