finally updated companion