Added TheMRod's changes.