Code update from test.acc.com