Have Fred use new retreat logic too