continuing brush up & got rid of cname