Changes to get code running