All of Michael's changes