Merged Pony+ with CAE.