Black updated, cnames added