do it properly, too