make_magic + interface brush-up