UPGRADE AND BUG FIXEd.