1.6: many changes