More changes to make it work once it links