Swapping D05 and D09 around