merge with loic's change of friday