More changes to figure out those pesky weights!