michaeljoseph/ccc template updates