cname added and a fix