Update with Catherine's initial design