Added RPY switcher