More changes - still needs to be fixed.