Changed the way opulence is handled