Yes..... all of that, but it will not be in effect until January 1, 2011.