Fixing more chris and caitlin stuff