rolled back to last working 9-3-14