Add thedax's changes.