massaged the code
more untested massage