Added Critter42's proposed changes