Bunch of new changes for various modes