Merge with Michael's changes