Small changes to get the code working for me again