More changes to get cartoons working...