updates with cartoon
 merge