Updated overall stuff