Updates for first pass CTF