Finally... Cusp-compatibility!