working version on FR24 data