Version 2.0 need to Cherry's code and verify before skipping