Latest changes prior to real life testing on SAF2