Synced up with official CM