Merged changes from David.