Updated to 1.6.x