Updated RF layout