Convert to pass strict rules