UPGRADED 4-01-2012