Inital changes for adding CTF.