Mode manager + kav2k's pull request

U know