Updated stuff for CTC