More update to 1.6