Adding back some removed rules