Merged Update From Herbert