More function changes, still chasing the banner duplication problem