Update with changes from Chris