More changes to make these work better