Added Evan's updates from ToughUdder repo