updating with latest C+T code