Synch'd with PM's repo.