Modified syntax to avoid headaches for Kai