More changes to make things work better