These two hunks are the new changes. Sorry about the wall of indentation change...