More changes to get things working