Aditional work on CT compliance
7 files changed