more compat updated for polyamorous