More changes to get this to work.