Changes to get code to work