Getting nearer. Fixed nbcc data