switched to using  and got rid of a few unused params