UPGRADED 1/10/2011