update based on @matzew feedback