removed spooky use of params causing all kinds of trouble