CORE 2122 mode changes