Oops! Part two of redo