Now working also for cfx96 data.