Code changes from test.acc.com