Fixcts changes

I hope it's the good branch