Some changes to Raniere's commit.