pre-switch commit