Reorganised master rx if branches