#790 polish the details a little more