Further tweaking to get Oscars to work.