CoC revamp for Android