added tons of gems
merge