use new config
comment code for faster update
revert to 1.6_R3