Upgraded code
Changed classname
Several updates