endogenous switching bug correction
shortcut added
endogenous switching bug correction
endogenous switching update