More changes to make it work.