Updated changes with a note on Stefan's patch.