Added effective date, and tons of testing.