Made this recipe a little more robust.