reconfiged for 1.6.6