More work on crafting