New: adapted