Revert "Needs reverting"

This reverts commit 224b850e63d7b779c407bcfe29d28ac6732235b0.
Single mode working