yay!  more elegant code!