More work on splitting up modes