Move to 1.6