Commit before refactor for 2 crafts.