Manually merging with Michael's changes