Merge Ippo's changes