#59: polished