These are my changes so far.