Working towards 1.6