Upgraded more gems