Now can combine over 4800 gems + small tweaks