update and fix for next - Update6