Mapraw/cp_35 at main