#104 addressed all CA violations