Class A rewrite to meet spec