Updated the blacksmith to be more robust.