updated for recovery shenanigans. part deux