changes I had to make to get things working