Code updates from test.acc.com