Fixing the fox and making more structural changes.