Updated crafting
Optimization