Moving to 1.6.5