More work done on updating to 1.6