Merge with cm and fastcharge