NXP-15306 : adapt to new design. Header not working yet