Update to CMs update (fucked merge. WTF.)

Signed-off-by: task650 <task650@gmail.com>