More changes to figure out why things are breaking