Added changes from constance.